Skip to content

[release-1.7] Fix: Avoid Helm Conflict When User Creates Custom .npmrc Secret - #190

Merged
rm3l merged 14 commits into
redhat-developer:release-1.7from
openshift-cherrypick-robot:cherry-pick-186-to-release-1.7
Jul 17, 2025
Merged

[release-1.7] Fix: Avoid Helm Conflict When User Creates Custom .npmrc Secret#190
rm3l merged 14 commits into
redhat-developer:release-1.7from
openshift-cherrypick-robot:cherry-pick-186-to-release-1.7

Conversation

@openshift-cherrypick-robot

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jul 17, 2025 •
edited by sourcery-ai Bot
Loading

Copy link
Copy Markdown

This is an automated cherry-pick of #186

/assign rm3l

Summary by Sourcery

Fix Helm conflict by removing default .npmrc Secret and adjusting plugin package references, and bump chart version.

Bug Fixes:

  • Remove built-in dynamic-plugins-npmrc Opaque Secret to prevent conflicts with custom .npmrc secrets
  • Change templated plugin package declarations to use full registry URLs instead of prepending scope

Enhancements:

  • Bump Backstage Helm chart version to 4.4.1

Documentation:

  • Update README badge to reflect the new chart version

@Fortune-Ndlovu openshift-cherrypick-robot
Fix: Avoid Helm Conflict When User Creates Custom .npmrc Secret
a3e8439 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
bump chart
15adcc3 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
Updated to always render the .npmrc Secret when orchestrator.enabled=…
95b40e0 
…true

Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
Updated extra
02b2d01 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
Updated extra
262dd65 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
remove helm secret block
f5bc2ca 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
revert
aa8d0c5 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
Telling Helms configmap and initcontainer to fetch the plugin from th…
f730288 
…e direct http tarball url instead of npm registry.

Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
fix schema
0181216 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
update _partials.tpl which is a template for orchestrator.plugins tha…
d168263 
…t injects the orchestrator plugiins dynamicallly wheneerv orchestrator.enabled=true

Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
update we no longer need a .npmrc to map the @redhat scope to Red Hat…
4c40ce2 
… registry.

Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
fix invalid package name
dd49a8c 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
update all
28a7b0b 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@Fortune-Ndlovu openshift-cherrypick-robot
update package name
71b0d2f 
Signed-off-by: Fortune-Ndlovu <fndlovu@redhat.com>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 17, 2025
Merged
5 tasks
@sourcery-ai

sourcery-ai Bot commented Jul 17, 2025 •
edited
Loading

Copy link
Copy Markdown

Reviewer's Guide

This PR backports fixes to remove conflicting .npmrc secret, update orchestrator plugin package resolution to full Red Hat npm registry tarball URLs, and bump the Backstage Helm chart version to 4.4.1.

Class diagram for updated orchestrator plugin package configuration

classDiagram
  class OrchestratorPluginsConfig {
    +string orchestrator.package
    +string orchestratorBackend.package
    +string scaffolderBackendOrchestrator.package
    +string orchestratorFormWidgets.package
    +string orchestrator.integrity
    +string orchestratorBackend.integrity
    +string scaffolderBackendOrchestrator.integrity
    +string orchestratorFormWidgets.integrity
  }

  class Plugin {
    +bool disabled
    +string package
    +string integrity
    +object pluginConfig
  }

  OrchestratorPluginsConfig <|-- Plugin

  %% Note: The 'package' fields now use full tarball URLs instead of npm short names.
Loading

File-Level Changes

Change Details Files
Remove custom .npmrc Secret template to prevent Helm conflicts
  • Deleted Secret definition for dynamic-plugins-npmrc
  • Removed Helm conditional around the .npmrc Secret block
 charts/backstage/templates/dynamic-plugins-configmap.yaml
Update orchestrator plugin package references to use full Red Hat npm registry URLs
  • Stripped scope prefix from package fields in template partials
  • Replaced short package identifiers with full tarball URLs in plugin values
 charts/backstage/templates/_partials.tpl
Bump Helm chart version and update README badge
  • Incremented chart version to 4.4.1 in Chart.yaml
  • Updated version badge in README.md
 charts/backstage/Chart.yaml
charts/backstage/README.md
Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@openshift-ci
openshift-ci Bot requested review from rm3l and zdrapela July 17, 2025 13:56
@sonarqubecloud

sonarqubecloud Bot commented Jul 17, 2025

Copy link
Copy Markdown

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

rm3l
rm3l approved these changes Jul 17, 2025
View reviewed changes

@rm3l rm3l left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Jul 17, 2025
@rm3l
rm3l merged commit f297cd0 into redhat-developer:release-1.7 Jul 17, 2025
7 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rm3l rm3l rm3l approved these changes
@zdrapela zdrapela Awaiting requested review from zdrapela

Assignees

@rm3l rm3l

Labels

lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@openshift-cherrypick-robot @rm3l @Fortune-Ndlovu